From 8334e9b1d8f763cc5d047b37ac41e1ed447f5322 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Mon, 6 Feb 2006 16:55:41 +0100
Subject: [PATCH] A few trivial cleanups from the HVM merge.

Signed-off-by: Keir Fraser <keir@xensource.com>
---
 xen/arch/x86/cpu/intel.c |  2 --
 xen/arch/x86/dom0_ops.c  | 14 ++++++++++++--
 xen/arch/x86/x86_64/mm.c |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index b699f4af54..98fe22ba87 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -10,8 +10,6 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
-#include <asm/hvm/vpit.h>
-#include <asm/hvm/vcpu.h>
 #include <asm/hvm/support.h>
 
 #include "cpu.h"
diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c
index 2629fa3671..600735f7db 100644
--- a/xen/arch/x86/dom0_ops.c
+++ b/xen/arch/x86/dom0_ops.c
@@ -454,8 +454,8 @@ void arch_getdomaininfo_ctxt(
 
     if ( HVM_DOMAIN(v) )
     {
-	hvm_store_cpu_guest_regs(v, &c->user_regs);
-	hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
+        hvm_store_cpu_guest_regs(v, &c->user_regs);
+        hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
     }
     else
     {
@@ -476,3 +476,13 @@ void arch_getdomaininfo_ctxt(
 
     c->vm_assist = v->domain->vm_assist;
 }
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index fbdc632011..01b54ef9ab 100644
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -188,7 +188,7 @@ long subarch_memory_op(int op, void *arg)
     l3_pgentry_t l3e;
     l2_pgentry_t l2e;
     unsigned long mfn, v;
-    unsigned int i = 0;
+    unsigned int i;
     long rc = 0;
 
     switch ( op )
-- 
2.30.2